api/member_views.py

@@ -190,7 +190,6 @@ def good_exchange(request):

                         good_ids.append(good_id)
              

                 
              

                     goods = []
              

                -
              

                     for good_id in good_ids:
              

                         try:
              

                             good = GoodsInfo.objects.select_for_update().get(good_id=good_id)
              
@@ -209,11 +208,10 @@ def good_exchange(request):

                         # 校验重复兑换
              

                         if good.only_once and GoodsOrderInfo.objects.filter(user_id=user_id, good_id=good_id, status=True).exists():
              

                             return response(MemberGoodStatusCode.GOOD_EXCHANGE_ONLY_ONCE)
              

                -        
              

                +
              

                         if good.good_type == GoodsInfo.PHYSICAL and address == '':
              

                             return response(MemberGoodStatusCode.GOOD_NO_ADDRESS)
              

                 
              

                -
              

                         user.integral -= good.integral
              

                         user.save()
              

                 
              

kodo/oauth_settings.py

@@ -225,8 +225,7 @@ def DJANGO_FILE_UPLOAD_BASE_PATH_CALLBACK_FUNC(request):

                     if zbar2:
              

                         return 'zbar2'
              

                 
              

                -    file_type = request.POST.get('file_type', '')
              

                -    return file_type
              

                +    return request.POST.get('file_type', '')
              

                 
              

                 
              

                 def DJANGO_FILE_UPLOAD_CALLBACK_FUNC(request, file_path=None, file_url=None):